From: David Härdeman <david@hardeman.nu>
Date: Tue, 21 Oct 2025 20:15:56 +0000 (+0200)
Subject: luci-mod-network: simplify cbi_update_table in dhcp.js
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org/%22http:/www.crowdsec.net//%22https%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22https%22?a=commitdiff_plain;h=57afc27d2d32573e99ee35ac5535c3fd52805db4;p=project%2Fluci.git

luci-mod-network: simplify cbi_update_table in dhcp.js

cbi_update_table() can already take a string suitable for
.querySelector() as its first argument. In addition, it will do the
right thing if the element isn't found, so this can be simplified a bit.

Signed-off-by: David Härdeman <david@hardeman.nu>
---

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index 1175e3ecfc..de2c8aedb8 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -761,7 +761,7 @@ return view.extend({
 					var leases = Array.isArray(leaseinfo.dhcp_leases) ? leaseinfo.dhcp_leases : [],
 					    leases6 = Array.isArray(leaseinfo.dhcp6_leases) ? leaseinfo.dhcp6_leases : [];
 
-					cbi_update_table(mapEl.querySelector('#lease_status_table'),
+					cbi_update_table('#lease_status_table',
 						leases.map(function(lease) {
 							var exp;
 							var vendor;
@@ -796,41 +796,41 @@ return view.extend({
 								exp
 							];
 						}),
-						E('em', _('There are no active leases')));
-
-					if (has_dhcpv6) {
-						cbi_update_table(mapEl.querySelector('#lease6_status_table'),
-							leases6.map(function(lease) {
-								var exp;
-
-								if (lease.expires === false)
-									exp = E('em', _('unlimited'));
-								else if (lease.expires <= 0)
-									exp = E('em', _('expired'));
-								else
-									exp = '%t'.format(lease.expires);
-
-								var hint = lease.macaddr ? hosts[lease.macaddr] : null,
-								    name = hint ? (hint.name || L.toArray(hint.ipaddrs || hint.ipv4)[0] || L.toArray(hint.ip6addrs || hint.ipv6)[0]) : null,
-								    host = null;
-
-								if (name && lease.hostname && lease.hostname != name && lease.ip6addr != name)
-									host = '%s (%s)'.format(lease.hostname, name);
-								else if (lease.hostname)
-									host = lease.hostname;
-								else if (name)
-									host = name;
-
-								return [
-									host || '-',
-									lease.ip6addrs ? lease.ip6addrs.join('<br />') : lease.ip6addr,
-									lease.duid,
-									lease.iaid,
-									exp
-								];
-							}),
-							E('em', _('There are no active leases')));
-					}
+						E('em', _('There are no active leases'))
+					);
+
+					cbi_update_table('#lease6_status_table',
+						leases6.map(function(lease) {
+							var exp;
+
+							if (lease.expires === false)
+								exp = E('em', _('unlimited'));
+							else if (lease.expires <= 0)
+								exp = E('em', _('expired'));
+							else
+								exp = '%t'.format(lease.expires);
+
+							var hint = lease.macaddr ? hosts[lease.macaddr] : null,
+							    name = hint ? (hint.name || L.toArray(hint.ipaddrs || hint.ipv4)[0] || L.toArray(hint.ip6addrs || hint.ipv6)[0]) : null,
+							    host = null;
+
+							if (name && lease.hostname && lease.hostname != name && lease.ip6addr != name)
+								host = '%s (%s)'.format(lease.hostname, name);
+							else if (lease.hostname)
+								host = lease.hostname;
+							else if (name)
+								host = name;
+
+							return [
+								host || '-',
+								lease.ip6addrs ? lease.ip6addrs.join('<br />') : lease.ip6addr,
+								lease.duid,
+								lease.iaid,
+								exp
+							];
+						}),
+						E('em', _('There are no active leases'))
+					);
 				});
 			});